Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

config: migrate off config.merge() #5015

Merged
merged 7 commits into from
Dec 4, 2024
Merged

Conversation

yuja
Copy link
Contributor

@yuja yuja commented Dec 3, 2024

Checklist

If applicable:

  • I have updated CHANGELOG.md
  • I have updated the documentation (README.md, docs/, demos/)
  • I have updated the config schema (cli/src/config-schema.json)
  • I have added tests to cover my changes

@martinvonz
Copy link
Member

Since the 0.23 release is tomorrow, should we wait with this until after that? This seems like something that could use more than a day of testing. What do people think?

cli/src/config.rs Outdated Show resolved Hide resolved
Copy link
Contributor Author

@yuja yuja left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the 0.23 release is tomorrow, should we wait with this until after that? This seems like something that could use more than a day of testing.

I'm fine in either way. A bigger change settings.get() -> stacked_config.get() is already in, so this PR has relatively small impact. However, it doesn't provide any UX improvement at this point.

cli/src/config.rs Outdated Show resolved Hide resolved
@martinvonz
Copy link
Member

I'm fine in either way.

I was thinking that this PR was migrating off the config crate when I asked (before I reviewed it), and then I didn't think to withdraw my question. I'm fine with merging this PR before the release.

yuja added 7 commits December 4, 2024 09:06
When I wrote the original lookup function, I didn't notice that the root config
value could be accessed as &config.cache without cloning. That's the only reason
I added split_safe_prefix().
config::Config will soon be replaced with StackedConfig, and UserSettings
provides more convenient methods than StackedConfig.
@yuja yuja force-pushed the push-xyxwvmuoqnxz branch from b23459f to aa7d7c8 Compare December 4, 2024 00:08
@yuja
Copy link
Contributor Author

yuja commented Dec 4, 2024

I was thinking that this PR was migrating off the config crate when I asked (before I reviewed it)

That would definitely require testing. It'll also include minor behavior changes.

@yuja yuja merged commit 8748a1e into jj-vcs:main Dec 4, 2024
18 checks passed
@yuja yuja deleted the push-xyxwvmuoqnxz branch December 4, 2024 01:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants